merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 14 Dec 2012 11:00:18 +0000 (20:00 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Dec 2012 11:00:18 +0000 (20:00 +0900)

Trivial merge